ENH: fixing bugs.. ready to release!!