fix bugs, lights done