some updates (i know, horrible commit message)