CODE FREEZE

a few random things