Improved command stabilty

Woot! Ready for the first pre-release!