Known issues added + tiny enhancement