Fixed problems
Changes some