Some more updates, still not 'stable'