Fixed issues, almost ready for testing.