fixed last(hope!) bugs;