quick improvements, finalizing