Fixed stuff

Please integrate