tweaks and more

Signed-off-by: Cameron Priest <cameron@tradegecko.com>