fix preferences and term issues