bunch of changes, unfortunate lack of commits