Removed Jopt. Cleaned up
Bugs
stuff