More bug fixes, started on stat sig