Fixes sprint9

some fixes