Big feature update and readme changes