some bugfixe and features added