Changes and a couple fixes.
Annoying..