Got everything fixed and caught up