partial map support
working maps version
final tweeks