A few small fixes + add Monster variant