more final commits

yeee
last final commit

done