[UPDATED] misc updates