Multiple changes

Multiple changes made without notes. Bad boy.