more bugs ... umm fixes I mean