Some minor enhacenments