Fixing bugs, test before commit