Fixed bug, clean up.