Edited some stuff, figured other stuff out