1st stab

Here is my 1st attempt at some patches. Be gentle on a n00b =)