added header stuff, @since fixes