3.0.8, bug fixes, optimalizations and minor modifications