Småbugs fix
Merge branch 'Release' of https://github.com/RepublicOfProgrammers/polakken into Release