Some fixes, added new labs