NOTES: Updated some todo and bug notes