added some stuff
Fixed some fuck-ups.