Fixed many lint issues (didn't have unused vars as a failure for last work), adding Scenery 0.2 compatibility