fix various bugs, prep for greater things (wildcards)