Cleaned up and fixed some access issues