More bugfixes! It seems like it should be pretty stable now