review todo's and update