Fixed dep notation, and null location

pretty simple commits. can rebase if ya want.