checks and a couple bugs