More small tweaks - time to test it out