Cleaning some stuff up, minor additions