Fixed several bugs and cleaned up project folder.