Fixes 2

fixed known bugs