Various bugfixes and nicities