Fixes, updates and better formatting