more changes

need to test with actual boxes etc...