fixes & more stuff