Experimental Alpha 0.02c

Cleaned up code, made some comments