Testing and bug fixes @ 2:23