Development features, bugfixes, code improvement