Added more settings/options and fixed more bugs.