cleaned up warnings and shiat