fixed some issues, dont know how to commit to old repository