updates reimplemented and bugfixes