16 Commits (fix/general-fixes)