Fixed options bug and updated some stuff a bit