More database removal, played around more with lighting