Various bugfixes and improvements

Driver should hopefully be a little more stable?