Tons of bug fixes, mostly workingg s