More bugfixes. Everything looks good!