Removed some Optionals
Bugfixes