same commit as last time, fixing bugs