bugfixes & tested

works frealz