added sropping and some other minor tweaks