some fixes and new maps