Update working, adding tweaks.