force update + more bugs fixed