A whole buncha stuff
merged changes