Testing and validation done, other minor updates.