Feature/final modifications and cleanup