pulled remote changes, removed some warnings