Changed some permissions and cleaned up