final touches for now :)