Feature/polishup

resolves #21 , resolves #18 , resolves #5 , resolves #4