stable version with schema included
small changes
remove log comments