lots of buggy changes