Cleanup
Better shortcuts
Readme fixed