Optimized some code, expanded some menues, corrected error.