Some tidying up post making most of the changes needed get basics working