Big update, pushing all changes from past couple weeks