* fixed bugs and added new options