Core update 2.2
minor cleanup
Change version number with update to core