Some small fixes, cleanup and new info