Finishing up and fixing a bug