add/rename/modify some methods; some tests still pending