re #25 cleanup and getting amrita to behave