final changes

all testing code is in place