Fixed map bugs and added boolean forms