merge changes

lolwut