Fixes #1 although we will have to re-open it later, because of the quick fixes and the almost finished stuff