added singularboders patch and cleaned up a bit