Adding device configurations and minor cleanup

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