+ alot fixes