N2C10

Added some of dratr fixes: https://github.com/dratr/Carbonite
Cleanup