fixed smallish stuff