finished rest of todo features