just a few small things
just a few merge errors