Improved options and added license