bug fix
added progress bars
cleanup