some stuff added. all still working :)