[UPDATED] Misc updates