Minor cleanup and settings, added 2015 version