tweeks and fixes