Updates and commetns to junk!

yay for that!