Final fixes and manual figure placement