commented out lua for testing and cleaned some stuff up