refs #54 - fixes build problems, upgrades to new api