Fixed

some fixes.