More bugfixes and stuff, v1.0.4