conditional boto, few more changes, cleanups