Added more granular settings, some fixes and improvements