Fix syntax warnings
add support for the topology option, refs #28