fixed more things, probably broke more things in the process
fixed more things that had been bothering me.