integrated options, fixed few bugs..