16 Commits (fix/minor-fixes)