merge
fix bugs before push
last bugs fixed, ready to push