bunch more changes. This will be more organised after lunch :)