fixed bugs and finished options