fixed typo and moved a sub