Updated all from my Computer

Nothing new (only crystal behavior (but rly buggy)) onyl some fixes and
tests