minor logic tweeks + slight rollback