updating and fixing stuff