fix various issues
1.0.3