final touches for 0.0.3.6 (hopefully)