bug fixes
moved to statically allocated objects, cleaned up tabbing to all spaces (4 spaces default)