Just some TODOs
Updated from FB
Updated ShowMarks