Fixes and Part 1.2