general update, removal of stupid defines