small fixes
stuff and hakerka prevention