more much needed updates for consistency