hehejo. some little fixes