Fixed some fundamentals