finished testing; minor cleanup