more minor changes

the grand merge is coming i swear