0.6-debug, optimization and accuracy increase