big change

lots of stuff...all good