Clean up

fixed waringings and stufff!