some changes, maybe something is buggy at this moment, i'll fix this ASAP