development update bugfixes #2