Added Maps Engine to library list

And cleaned up some mess, since @dh-- doesn't read my suggestions.