Ading additional features
Small bugfixes