Gingerbread

Some issues resolved.