fixes and cont