Added 2 New Liquids!

Added 2 New Liquids, Cleaned up Old code, and will   work on better
functionality tomorrow.