Added fluxmap subpackage
More testing and bug fixes.