added, stuff fixed bugs