Big cleanup, some fixes and prepare of alpha 2