Tweaks

Still a long way from actually working.