Cleaned out a few things, ported more commands.