merged all lagen.nu-related changes into main project