fixed a lot of major and minor bugs
fixed merge conflict
ign