fixed warnings
minor changes