Minor changes, cleaning some stuff up...