Fixed: Better code formatting and added more options