recent fixes; still have problems with tabs