v.1.0.12 - sm_drop, some cleanup and fixes