fixed bugs. this shall be considered first commit ;)