Adding stuff/fixing stuff