Finished application with error fixes