All bugs fixed except two (will add issues)