Finished update for new functionality

Smaller bug fixes, removed unnecessary code