tons of changes to various core features - large update from internal testing