implemented more stuff and fixed all bugs/warnings