map targets added, some fixes