fixing bugs
changes merged