Pass done + minor fixes