Fixed some more bugs, removed some cruft, made normalize properly recursive