More projects added + some fix