Cleaned up comments. also, cuttlefish now takes -s dir instead of -s file