- minor improvements just for stability purposes