tweaks, fixes
0.5, tweaks and fixes