Fixed some minor issues, enable for testing