small addition + bugfix
Updated some forgotten stuff