Adding things and fixing stuff