fixed shit that havent been fixed in last commit

1145