More bugfixes, diameter limit cutting fix