updated main.cpp and some additional changes to mainwindow