fix edge cases
fix dollar sign issue
change travis config