First take at personal tweaks - still not ready yet