fixed ARC, fixed warnings