Added options and fixed bugs