presentatational some bug fixes