added ui-router option, other smaller changes/fixes