updates, fixing stuff