tidied up a little, broke more stuff