implemented
fixes
stuff