Add lights and better error handling