sorted out most of the issues..