Added progressbar
bug fix
Various fixes