minor notes and moved some methods