Update some small changes, add my personal concerns

Signed off by hexafraction/aa