Develop

Necessary fixes.