04/17/2013

Compressed and cleaned up functions