minification + some fix