v4.2 final commit

Little bugs with update and one time code. Should be ready for user
update.