Minor fixes
Finished!