added fallbacks, other goodies
0.0.6