some tweeks and updates