tidied up has support. Other minor changes