fixed first files, fixed warnings