fixed path and some consitency