Minor changes after merge, now all features running properly