Fixed major issues

Please merge