bug fixes and add option to remove containers