refactored argument filtering
restyled and fixed graph issues