Feature/adjustments

@tomdavies review me baby! yeah!