fixed obvious issues