More commands and tweeks