Revving version number to 1.2.1 with small fixes