Big improvements made

Can't Not Laugh