Refactoring after completion

Added javadocs
Cleanup up error handling
Remove many application messages