fixing bugs
additional functionality