add molokai, and some improvments