Fixes. Still trying to work out sunlight