fix a couple bugs; hopefully freezing stare