cleaned up some leftover bugs from last commit