finished with comments; somehow; almost ugly :(... no search still; next is deploy again