Alpha 2.1c

more fixes