fixed warnings
updated todos