Major: 0.0.2.1

Small updates