v0.2 now and cleaned up stuff