More Testing and tweaking