Added SRM 595; redid some geometry stuff.