fixed bug and something else