Fixed loose end comply errrors

Almost time to start testing!!