Fixed major problems