added updates / removed useless stuff