Fixed errors, looks good to me, going to merge into master