fixes added (version is compilable)