Fixed paths, added new commands