Fixed Bugs etc.
Fixed conflicts