Streamlining, restructuring, several minor additions