added some features

@ fcpn.ch/dgHk6