More updates & functional add ins
more edits