updated some parts which don't really make a problem but are better this way