Final review and resting bug