Revisions and fixes

Signed-off-by: shalott <shalott@gmail.com>