Added todo list for fixes/changes, trimmed down default categories