more changes and some ugly lightmaps!