Alot of various minor fixes