done some tweaking ect, currently trying to eliminate a bug