Error checking + test updates
GUI fixes