added small support, debugged.