couple more updates, looking good for secure HW1