cleaned up warnings and comments