Commented and fixed warnings