Version 145

Last merge + small fixes