final changes. Fuck it's late...