bug fixing, basic functions are working again