* Various mappings, mainly entity * wrong tabulation * added smooth lighting render class * resolved conflicts * oupsi * '-'