Changed stuff for Procfile
added interceptors, and some refactoring