Antimarscirce, problems with non-capturing moves

[WalterL-wL]

I might have encountered TWO problems in Antimarscirce (AntiMC) with non-capturing moves in Popeye v4.89:
1.) solution shows invalid moves ("Nullzug"), like bRh6[-h8]-h6 or bRf8[-h8]-f8
2.) w castling is ignored if wK is not already positioned on e1, like wKd1[-e1]-0-0; (possibly also in cases like e.g. bK(anywhere)[-e8]-0-0-0); and even wKg1[-e1]-0-0 should be a valid move, because the R changes its position...

ad 1.) In presenting a solution Popeye also seems to include invalid moves ("Nullzug"). Example (German notation, ref. Schwalbe#19514):

ford hs#2.5
bedi antimarscirce
Stei Weis Kc8 Th5 Schw Ka6 Se8 Sh1 Te1 Th6

Popeye presents 3 "solutions":
1 valid:
1...Sh1-g8-f6 2.Th5-h1-f1 Th6-h8-g8 3.Tf1×f6 + Se8×f6#
2 invalid:
1...Th6-h8-h6 2.Th5×h1 Th6-h8-f8 3.Th1-h1-h6 + Se8-g8-f6#
1...Th6-h8-f8 2.Th5×h1 Tf8-h8-f8 3.Th1-h1-h6 + Se8-g8-f6#

ad 2.) In AntiMC before executing a non-capturing move the man is reborn on its regular rebirth square (e1 for the wK). Rebirth - obviously including AntiMC's kind of "advance-rebirth" - resets the right to castle! Castling is a king's move and it is non-capturing. Consequently a wK, anywhere on the board, can be reborn first on e1 in order to execute castling with an (unmoved or reborn before) wR (provided the standard castling requirements are met). Popeye in fact does consider castling in AntiMC, but only if wKe1[-e1]-0-0. Simplified Example (English notation):

stip h#1
cond antimarscirce
Forsyth 8/3p4/4pk2/5r2/7S/8/8/4K2R

Popeye (correctly) presents 2 solutions:
1.Rf5-a8-e8 0-0#
1.Rf5-a8-e8 Rh1[-h1]-f1#
But as soon as the wK is positioned somewhere else in the diagram (e.g. wKd1) Popeye does not find the castling solution any more, only the other solution:
1.Rf5-a8-e8 Rh1[-h1]-f1#
In my opinion there should also be a second solution, like:
1.Rf5-a8-e8 Kd1[-e1]-0-0#

Thanks!