Big update (sync from internal VCS): nicer, more stable, less bugs :)