crazy bugs fixed, hopefully