fixed some bugs, but still doesn't work proppworl properlly