Small fixes, still have more to do