1.0.3 dev

merging a few more issues with 1.0.3-dev