bug fixes and pretty-ups