Lasts bugsfix before beta
Last commit. Beta ready git add ./