cleanups. widget needs lots of work. haven't got time to work on it yet properly.