Small changes

Disabled a few things, making it easier for testing