cleaned up main
Cleanup, few fixes