accounts table + odd bugs here and there