fixing bugs. not yet there ...