tweeks and bugs #1