Fixes & polish 1