Final props system + fixes