silence some warnings temporarily
added comments and cleaned up a bit