Bugfixes and milestone updates