Rebase

* Fixes, improvements, code style, conflict derps out.
Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>