Updates + (minor) bug fixes