observable added (first approach), some bugfixes