move source to end and tweak a few things