[issue #168][WIP] fixing bugs