Improve modifies, etc

Signed-off-by: Ollie <dzineit@live.co.uk>