updating from cstalder repo

hope this doesn't break stuff