bug fixes, imrpoved world generation