Remaining changes.

Signed-off-by: Michael Fabian Dirks <hellbirdxjun@gmail.com>