General cleanup. Still horrifically broken.