4/22/2013 Code updates and rule updates

Signed-off-by: deathwarror <deathwarror@gmail.com>