*Bugfixes and Optional.of -> Optional.fromNullable