fixing a few stuff after being so f.cking stupid!!
good progress toward 100% specs