Tweeks and cleanup