131b872 tweaks and added speakers