little fixes, hopefully no collisions with tabs